From: emellor@ewan <emellor@ewan>
Date: Tue, 27 Sep 2005 13:36:58 +0000 (+0100)
Subject: Remove the domain and VM paths from the store when destroying a domain.  This
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16769^2~16^2~37
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=4ac7f7b347f69b90b2fd51b326b24c0cde0c0068;p=xen.git

Remove the domain and VM paths from the store when destroying a domain.  This
goes a long way towards fixing the problem of stale entries in the store.

Signed-off-by: Ewan Mellor <ewan@xensource.com>
---

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index 14410f9e6c..a3d6739bec 100644
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -976,10 +976,20 @@ class XendDomainInfo:
 
         self.cleanup()
 
+        try:
+            self.removeVm()
+        except Exception:
+            log.exception("Removing VM path failed.")
+
+        try:
+            self.removeDom()
+        except Exception:
+            log.exception("Removing domain path failed.")
+
         try:
             if self.domid is not None:
                 xc.domain_destroy(dom=self.domid)
-        except Exception, exn:
+        except Exception:
             log.exception("XendDomainInfo.destroy: xc.domain_destroy failed.")